Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added optional packet metadata to the packet and message types (backport #2305) #2504

Merged
merged 6 commits into from
Oct 14, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 10, 2022

This is an automatic backport of pull request #2305 done by Mergify.
Cherry-pick of 82397d6 has failed:

On branch mergify/bp/release/v2.5.x/pr-2305
Your branch is up to date with 'origin/release/v2.5.x'.

You are currently cherry-picking commit 82397d6.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   modules/apps/transfer/client/cli/tx.go
	modified:   modules/apps/transfer/keeper/msg_server.go
	modified:   modules/apps/transfer/keeper/msg_server_test.go
	modified:   modules/apps/transfer/keeper/relay.go
	modified:   modules/apps/transfer/types/events.go
	modified:   modules/apps/transfer/types/msgs.go
	modified:   modules/apps/transfer/types/msgs_test.go
	modified:   modules/apps/transfer/types/packet.go
	modified:   modules/apps/transfer/types/packet_test.go
	modified:   proto/ibc/applications/transfer/v1/tx.proto
	modified:   proto/ibc/applications/transfer/v2/packet.proto

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   docs/apps/transfer/messages.md
	both modified:   docs/ibc/proto-docs.md
	both modified:   go.mod
	both modified:   go.sum
	deleted by us:   modules/apps/29-fee/transfer_test.go
	deleted by us:   modules/apps/transfer/ibc_module.go
	both modified:   modules/apps/transfer/keeper/mbt_relay_test.go
	both modified:   modules/apps/transfer/keeper/relay_test.go
	both modified:   modules/apps/transfer/spec/05_events.md
	both modified:   modules/apps/transfer/transfer_test.go
	both modified:   modules/apps/transfer/types/packet.pb.go
	both modified:   modules/apps/transfer/types/tx.pb.go
	deleted by us:   proto/ibc/applications/interchain_accounts/controller/v1/tx.proto

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* added optional packet metadata to the packet and message types

* added docs

* breaking the api (backports should add a utility function for this)

* adding nil metadata on all the calls

* added metadata to the cli

* added events

* breaking api for FungibleTokenPacketData

* hex encoding metadata

* added abstraction

* fixed bad merge

* added tests with metadata

* added missing metadata to packet for recv

* cleaning up metadata on every test

* reset metadata

* added metadata flag

* lint

* Update modules/apps/transfer/client/cli/tx.go

Co-authored-by: Damian Nolan <[email protected]>

* fixed bad call in tests

Co-authored-by: Damian Nolan <[email protected]>
(cherry picked from commit 82397d6)

# Conflicts:
#	docs/apps/transfer/messages.md
#	docs/ibc/proto-docs.md
#	go.mod
#	go.sum
#	modules/apps/29-fee/transfer_test.go
#	modules/apps/transfer/ibc_module.go
#	modules/apps/transfer/keeper/mbt_relay_test.go
#	modules/apps/transfer/keeper/relay_test.go
#	modules/apps/transfer/spec/05_events.md
#	modules/apps/transfer/transfer_test.go
#	modules/apps/transfer/types/packet.pb.go
#	modules/apps/transfer/types/tx.pb.go
#	proto/ibc/applications/interchain_accounts/controller/v1/tx.proto
@colin-axner
Copy link
Contributor

I'll fix the conflicts

@colin-axner colin-axner merged commit a9495ad into release/v2.5.x Oct 14, 2022
@colin-axner colin-axner deleted the mergify/bp/release/v2.5.x/pr-2305 branch October 14, 2022 11:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants